build: Make libsoup optional again

The "remote cookies" code broke this.  While I'm not sure anyone is
actually using ostree-without-http, it isn't too hard to keep the
build time conditional going.  Further, this work is preparatory for
libcurl porting.

Closes: #621
Approved by: jlebon

diff --git a/Makefile-ostree.am b/Makefile-ostree.am
index 9f2119dc68466d5719dce584f10572f6e9436687..e6b1eabe5a4888574e1448291df77b93d7fc6252 100644 (file)
--- a/Makefile-ostree.am
+++ b/Makefile-ostree.am
@@ -80,17 +80,22 @@ ostree_SOURCES += \
 ostree_SOURCES += \
        src/ostree/ot-remote-builtins.h \
        src/ostree/ot-remote-builtin-add.c \
-       src/ostree/ot-remote-builtin-add-cookie.c \
        src/ostree/ot-remote-builtin-delete.c \
-       src/ostree/ot-remote-builtin-delete-cookie.c \
        src/ostree/ot-remote-builtin-gpg-import.c \
        src/ostree/ot-remote-builtin-list.c \
-       src/ostree/ot-remote-builtin-list-cookies.c \
        src/ostree/ot-remote-builtin-show-url.c \
        src/ostree/ot-remote-builtin-refs.c \
        src/ostree/ot-remote-builtin-summary.c \
        $(NULL)
 
+if USE_LIBSOUP
+ostree_SOURCES += \
+       src/ostree/ot-remote-builtin-add-cookie.c \
+       src/ostree/ot-remote-builtin-delete-cookie.c \
+       src/ostree/ot-remote-builtin-list-cookies.c \
+       $(NULL)
+endif
+
 src/ostree/parse-datetime.c: src/ostree/parse-datetime.y Makefile
        $(AM_V_GEN) $(YACC) $< -o $@
 

diff --git a/Makefile-tests.am b/Makefile-tests.am
index d4685237ff30edaae9540e67724259c7083d65d2..5782fcbd06736ee322701aa786e4f4b9c35471ec 100644 (file)
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -44,7 +44,6 @@ dist_test_scripts = \
        tests/test-pull-subpath.sh \
        tests/test-archivez.sh \
        tests/test-remote-add.sh \
-       tests/test-remote-cookies.sh \
        tests/test-remote-headers.sh \
        tests/test-remote-gpg-import.sh \
        tests/test-commit-sign.sh \
@@ -101,6 +100,10 @@ else
 EXTRA_DIST += tests/test-rofiles-fuse.sh
 endif
 
+if USE_LIBSOUP
+dist_test_scripts += tests/test-remote-cookies.sh
+endif
+
 # This one uses corrupt-repo-ref.js
 js_tests = tests/test-corruption.sh
 if BUILDOPT_GJS

diff --git a/src/ostree/ot-builtin-remote.c b/src/ostree/ot-builtin-remote.c
index 31924eb19d22c775d982af93b05fd29ef1eaa8f1..57c3ae090582c4970bdd5b2c30863c62d2a87fbf 100644 (file)
--- a/src/ostree/ot-builtin-remote.c
+++ b/src/ostree/ot-builtin-remote.c
@@ -33,13 +33,15 @@ typedef struct {
 
 static OstreeRemoteCommand remote_subcommands[] = {
   { "add", ot_remote_builtin_add },
-  { "add-cookie", ot_remote_builtin_add_cookie },
   { "delete", ot_remote_builtin_delete },
-  { "delete-cookie", ot_remote_builtin_delete_cookie },
   { "show-url", ot_remote_builtin_show_url },
   { "list", ot_remote_builtin_list },
-  { "list-cookies", ot_remote_builtin_list_cookies },
   { "gpg-import", ot_remote_builtin_gpg_import },
+#ifdef HAVE_LIBSOUP
+  { "add-cookie", ot_remote_builtin_add_cookie },
+  { "delete-cookie", ot_remote_builtin_delete_cookie },
+  { "list-cookies", ot_remote_builtin_list_cookies },
+#endif
   { "refs", ot_remote_builtin_refs },
   { "summary", ot_remote_builtin_summary },
   { NULL, NULL }

diff --git a/src/ostree/ot-remote-builtins.h b/src/ostree/ot-remote-builtins.h
index 289e2e0d33b1dd7a8c3b9f510de6c0e73915ea05..aa2a7b6c234d374ea986f36a26e884be4f646639 100644 (file)
--- a/src/ostree/ot-remote-builtins.h
+++ b/src/ostree/ot-remote-builtins.h
@@ -25,12 +25,14 @@
 G_BEGIN_DECLS
 
 gboolean ot_remote_builtin_add (int argc, char **argv, GCancellable *cancellable, GError **error);
-gboolean ot_remote_builtin_add_cookie (int argc, char **argv, GCancellable *cancellable, GError **error);
 gboolean ot_remote_builtin_delete (int argc, char **argv, GCancellable *cancellable, GError **error);
-gboolean ot_remote_builtin_delete_cookie (int argc, char **argv, GCancellable *cancellable, GError **error);
 gboolean ot_remote_builtin_gpg_import (int argc, char **argv, GCancellable *cancellable, GError **error);
 gboolean ot_remote_builtin_list (int argc, char **argv, GCancellable *cancellable, GError **error);
+#ifdef HAVE_LIBSOUP
+gboolean ot_remote_builtin_add_cookie (int argc, char **argv, GCancellable *cancellable, GError **error);
 gboolean ot_remote_builtin_list_cookies (int argc, char **argv, GCancellable *cancellable, GError **error);
+gboolean ot_remote_builtin_delete_cookie (int argc, char **argv, GCancellable *cancellable, GError **error);
+#endif
 gboolean ot_remote_builtin_show_url (int argc, char **argv, GCancellable *cancellable, GError **error);
 gboolean ot_remote_builtin_refs (int argc, char **argv, GCancellable *cancellable, GError **error);
 gboolean ot_remote_builtin_summary (int argc, char **argv, GCancellable *cancellable, GError **error);